Merge branch 'master' of git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Fri, 23 Jun 2017 15:02:21 +0000 (11:02 -0400)
committerTom Rini <[email protected]>
Fri, 23 Jun 2017 15:02:21 +0000 (11:02 -0400)

Trivial merge